From 4b95ad776cde673455bacae85ac93c40bf09fcb7 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 8 Mar 2010 19:11:47 +0000 Subject: [PATCH] x86: a little bit of cleanup Signed-off-by: Jan Beulich --- xen/arch/x86/io_apic.c | 12 ++---------- xen/arch/x86/irq.c | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index d99d3cee40..977d939ca0 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -1658,15 +1658,7 @@ static void end_msi_irq(unsigned int irq) ack_APIC_irq(); /* ACKTYPE_EOI */ } -static void shutdown_msi_irq(unsigned int irq) -{ - mask_msi_irq(irq); -} - -static void set_msi_affinity_irq(unsigned int irq, cpumask_t cpu_mask) -{ - set_msi_affinity(irq, cpu_mask); -} +#define shutdown_msi_irq mask_msi_irq /* * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices, @@ -1680,7 +1672,7 @@ hw_irq_controller pci_msi_type = { .disable = mask_msi_irq, .ack = ack_msi_irq, .end = end_msi_irq, - .set_affinity = set_msi_affinity_irq, + .set_affinity = set_msi_affinity, }; static inline void init_IO_APIC_traps(void) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 08dfd76960..c0b4f2289d 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -42,7 +42,7 @@ int __read_mostly *irq_status = NULL; #define IRQ_VECTOR_UNASSIGNED (0) -DECLARE_BITMAP(used_vectors, NR_VECTORS); +static DECLARE_BITMAP(used_vectors, NR_VECTORS); struct irq_cfg __read_mostly *irq_cfg = NULL; -- 2.30.2